From 126620575adc6bb0982d9064ccded5c527e49892 Mon Sep 17 00:00:00 2001 From: "lynx@idefix.cl.cam.ac.uk" Date: Mon, 23 Dec 2002 09:37:07 +0000 Subject: [PATCH] bitkeeper revision 1.7.3.44 (3e06d943WVm5RM1KDm-9UH1Bu3ZTbA) bugfixes --- xenolinux-2.4.16-sparse/arch/xeno/mm/get_unmapped_area.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xenolinux-2.4.16-sparse/arch/xeno/mm/get_unmapped_area.c b/xenolinux-2.4.16-sparse/arch/xeno/mm/get_unmapped_area.c index 332b873377..f97cb8927a 100644 --- a/xenolinux-2.4.16-sparse/arch/xeno/mm/get_unmapped_area.c +++ b/xenolinux-2.4.16-sparse/arch/xeno/mm/get_unmapped_area.c @@ -118,7 +118,7 @@ addr, unsigned long len, unsigned long pgoff, unsigned long flags) { if ( TASK_SIZE - len < addr ) return -ENOMEM; - if ( vma && (vma->vm_start < node->vm_start) ) + if ( vma && ((curr == direct_list) || (vma->vm_start < node->vm_start))) { /* Do we fit before VMA node? */ if ( addr + len <= vma->vm_start ) return addr; @@ -135,7 +135,7 @@ addr, unsigned long len, unsigned long pgoff, unsigned long flags) } else { - /* Reached end of VMA and direct_map lists */ + /* !vma && curr == direct_list */ return addr; } } -- 2.30.2